projects
/
gtk4.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
2e4b1e7
)
icontheme: Avoid a crash
author
Matthias Clasen
<mclasen@redhat.com>
Sat, 30 Jan 2016 04:36:24 +0000
(23:36 -0500)
committer
Matthias Clasen
<mclasen@redhat.com>
Sat, 30 Jan 2016 05:29:04 +0000
(
00:29
-0500)
gtk_icon_info_new_for_file with a size of 0 would fail for
symbolic pngs because we ended up scaling with 0. Avoid this.
gtk/gtkicontheme.c
patch
|
blob
|
history
diff --git
a/gtk/gtkicontheme.c
b/gtk/gtkicontheme.c
index 0a0425829ba4305a04b405f50ac603dcff8ed82e..d7dc37154d361dc5bf1e89f8e484b4971c5ca7a5 100644
(file)
--- a/
gtk/gtkicontheme.c
+++ b/
gtk/gtkicontheme.c
@@
-3949,7
+3949,7
@@
icon_info_ensure_scale_and_pixbuf (GtkIconInfo *icon_info)
icon_info->scale = image_size / 1000.;
else if (icon_info->scale < 0.0)
{
- if (image_size > 0)
+ if (image_size > 0
&& scaled_desired_size > 0
)
icon_info->scale = (gdouble)scaled_desired_size / (gdouble)image_size;
else
icon_info->scale = 1.0;